blob: removes race condition between ctx cancellation and stream close#167489
Merged
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom Apr 6, 2026
Merged
Conversation
Previously, our remote local storage writer would always send a half-close and wait for a response when `Close` was called, even in the event of a context cancellation. This resulted in a race condition where either the context cancellation or `Close` could be surfaced to the RPC server first. If the former arrived first, the server would `Recv` a non-`EOF` error, indicating a failed write and would cleanup the file. If the latter arrived first, the server would see an `EOF` error, indicating a successful write and the file would be preserved. As both a context cancellation and a `SendClose` will cleanup the connection, this commit teaches the remote writer to only `SendClose` if the context has not been canceled. Fixes: cockroachdb#167121 Release note: None
Contributor
|
😎 Merged successfully - details. |
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
msbutler
approved these changes
Apr 6, 2026
Collaborator
msbutler
left a comment
msbutler
left a comment
There was a problem hiding this comment.
Nice job tracking this down! I'd clean up the language in the commit message before merging:
- s/remote local server/remoteClient/r
- i don't think "half close" is an actual term?
Contributor
Author
|
Collaborator
|
ah, nevermind. carry on. |
Contributor
Author
|
TFTR! /trunk merge |
This was referenced Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, our remote local storage writer would always send a half-close and wait for a response when
Closewas called, even in the event of a context cancellation. This resulted in a race condition where either the context cancellation orClosecould be surfaced to the RPC server first. If the former arrived first, the server wouldRecva non-EOFerror, indicating a failed write and would cleanup the file. If the latter arrived first, the server would see anEOFerror, indicating a successful write and the file would be preserved.As both a context cancellation and a
SendClosewill cleanup the connection, this commit teaches the remote writer to onlySendCloseif the context has not been canceled.Fixes: #167121
Release note: None